Move classes that currently derive from GtkObject to GInitiallyUnowned

diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index d8d344e8ed426eae0b227b585c717f030ece6098..146fbd4d585e8ec443362c8954897641c10fa7f7 100644 (file)
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -66,7 +66,7 @@ static guint adjustment_signals[LAST_SIGNAL] = { 0 };
 
 static guint64 adjustment_changed_stamp = 0; /* protected by global gdk lock */
 
-G_DEFINE_TYPE (GtkAdjustment, gtk_adjustment, GTK_TYPE_OBJECT)
+G_DEFINE_TYPE (GtkAdjustment, gtk_adjustment, G_TYPE_INITIALLY_UNOWNED)
 
 static void
 gtk_adjustment_class_init (GtkAdjustmentClass *class)
@@ -318,7 +318,7 @@ gtk_adjustment_dispatch_properties_changed (GObject     *object,
     }
 }
 
-GtkObject *
+GObject *
 gtk_adjustment_new (gdouble value,
                    gdouble lower,
                    gdouble upper,

diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 39a6f86293aaa7fb4518297a31afce8b04949902..1435ba50f98b2f87becd02021f2807feadf466e4 100644 (file)
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -31,9 +31,8 @@
 #ifndef __GTK_ADJUSTMENT_H__
 #define __GTK_ADJUSTMENT_H__
 
-
-#include <gdk/gdk.h>
 #include <gtk/gtkobject.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -50,7 +49,7 @@ typedef struct _GtkAdjustmentClass  GtkAdjustmentClass;
 
 struct _GtkAdjustment
 {
-  GtkObject parent_instance;
+  GInitiallyUnowned parent_instance;
 
   gdouble GSEAL (lower);
   gdouble GSEAL (upper);
@@ -62,7 +61,7 @@ struct _GtkAdjustment
 
 struct _GtkAdjustmentClass
 {
-  GtkObjectClass parent_class;
+  GInitiallyUnownedClass parent_class;
 
   void (* changed)      (GtkAdjustment *adjustment);
   void (* value_changed) (GtkAdjustment *adjustment);
@@ -76,7 +75,7 @@ struct _GtkAdjustmentClass
 
 
 GType     gtk_adjustment_get_type              (void) G_GNUC_CONST;
-GtkObject* gtk_adjustment_new                  (gdouble          value,
+GObject*   gtk_adjustment_new                  (gdouble          value,
                                                 gdouble          lower,
                                                 gdouble          upper,
                                                 gdouble          step_increment,

diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index e0d6839540eb7e5e12265b11b2980a16d8f3d9b3..814a26cb3a08066866bc25d36bb5e26d682efb2a 100644 (file)
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -112,8 +112,7 @@ enum {
 
 static guint  cell_renderer_signals[LAST_SIGNAL] = { 0 };
 
-
-G_DEFINE_ABSTRACT_TYPE(GtkCellRenderer, gtk_cell_renderer, GTK_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE(GtkCellRenderer, gtk_cell_renderer, G_TYPE_INITIALLY_UNOWNED)
 
 static void
 gtk_cell_renderer_init (GtkCellRenderer *cell)

diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index 934406bbb0a012787d73d1670d625357c4f4c37a..02647033f72c9c11399f964e85a455d1024524d4 100644 (file)
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -58,7 +58,7 @@ typedef struct _GtkCellRendererClass         GtkCellRendererClass;
 
 struct _GtkCellRenderer
 {
-  GtkObject parent;
+  GInitiallyUnowned parent_instance;
 
   /* <private> */
   GtkCellRendererPrivate *priv;
@@ -66,7 +66,7 @@ struct _GtkCellRenderer
 
 struct _GtkCellRendererClass
 {
-  GtkObjectClass parent_class;
+  GInitiallyUnownedClass parent_class;
 
   /* vtable - not signals */
   GtkSizeRequestMode (* get_request_mode)                (GtkCellRenderer      *cell);

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index f0e437fe05cd90351276894f668be193380c5f8d..9d4e24856fe3ad774f810ade43c513418f895c65 100644 (file)
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -41,13 +41,13 @@ typedef enum {
 
 struct _GtkFileFilterClass
 {
-  GtkObjectClass parent_class;
+  GInitiallyUnownedClass parent_class;
 };
 
 struct _GtkFileFilter
 {
-  GtkObject parent_instance;
-  
+  GInitiallyUnowned parent_instance;
+
   gchar *name;
   GSList *rules;
 
@@ -74,7 +74,7 @@ struct _FilterRule
 static void gtk_file_filter_finalize   (GObject            *object);
 
 
-G_DEFINE_TYPE (GtkFileFilter, gtk_file_filter, GTK_TYPE_OBJECT)
+G_DEFINE_TYPE (GtkFileFilter, gtk_file_filter, G_TYPE_INITIALLY_UNOWNED)
 
 static void
 gtk_file_filter_init (GtkFileFilter *object)

diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index 5d4c54e78849583a44e571120f39112792b9c44d..577493c4725d7083f66bf71755cc04f51a30ad26 100644 (file)
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -83,7 +83,7 @@ gtk_hscale_new_with_range (gdouble min,
                            gdouble max,
                            gdouble step)
 {
-  GtkObject *adj;
+  GObject *adj;
   GtkScale *scale;
   gint digits;
 

diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index fd9d0b313c15f7c5bbd1c93f1fbaf357e6a2b9bf..1f2b1fbf2dcb0b5d8dd8464d5239348e3ccf0b99 100644 (file)
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -41,8 +41,8 @@ typedef enum {
 
 struct _GtkRecentFilter
 {
-  GtkObject parent_instance;
-  
+  GInitiallyUnowned parent_instance;
+
   gchar *name;
   GSList *rules;
   
@@ -51,7 +51,7 @@ struct _GtkRecentFilter
 
 struct _GtkRecentFilterClass
 {
-  GtkObjectClass parent_class;
+  GInitiallyUnownedClass parent_class;
 };
 
 struct _FilterRule
@@ -75,7 +75,7 @@ struct _FilterRule
   } u;
 };
 
-G_DEFINE_TYPE (GtkRecentFilter, gtk_recent_filter, GTK_TYPE_OBJECT)
+G_DEFINE_TYPE (GtkRecentFilter, gtk_recent_filter, G_TYPE_INITIALLY_UNOWNED)
 
 
 static void

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index d869240eea92fbf1a436ce90ae110e68ad4cddac..f136e7cd801e8c497334358d31adde6fb990915a 100644 (file)
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -546,7 +546,7 @@ gtk_scale_new_with_range (GtkOrientation orientation,
                           gdouble        max,
                           gdouble        step)
 {
-  GtkObject *adj;
+  GObject *adj;
   gint digits;
 
   g_return_val_if_fail (min < max, NULL);

diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 72a96201cabd609135004c63c10e2f6a3657e423..3e4f653cf610f00b6c72d6a4e413d62029163698 100644 (file)
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -580,7 +580,7 @@ gtk_scale_button_new (GtkIconSize   size,
                      const gchar **icons)
 {
   GtkScaleButton *button;
-  GtkObject *adj;
+  GObject *adj;
 
   adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
 

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index cef3c7b2b93a1c6013e85b5da370cfcb50d4b631..50f48d353e489888f86b6fd53f485f66a900d8c6 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -98,7 +98,6 @@ enum
 
 static void gtk_spin_button_editable_init  (GtkEditableInterface *iface);
 static void gtk_spin_button_finalize       (GObject            *object);
-static void gtk_spin_button_destroy        (GtkObject          *object);
 static void gtk_spin_button_set_property   (GObject         *object,
                                            guint            prop_id,
                                            const GValue    *value,
@@ -107,6 +106,7 @@ static void gtk_spin_button_get_property   (GObject         *object,
                                            guint            prop_id,
                                            GValue          *value,
                                            GParamSpec      *pspec);
+static void gtk_spin_button_destroy        (GtkObject          *object);
 static void gtk_spin_button_map            (GtkWidget          *widget);
 static void gtk_spin_button_unmap          (GtkWidget          *widget);
 static void gtk_spin_button_realize        (GtkWidget          *widget);
@@ -193,12 +193,10 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
   GtkBindingSet    *binding_set;
 
   gobject_class->finalize = gtk_spin_button_finalize;
-
   gobject_class->set_property = gtk_spin_button_set_property;
   gobject_class->get_property = gtk_spin_button_get_property;
 
   object_class->destroy = gtk_spin_button_destroy;
-
   widget_class->map = gtk_spin_button_map;
   widget_class->unmap = gtk_spin_button_unmap;
   widget_class->realize = gtk_spin_button_realize;
@@ -544,7 +542,7 @@ static void
 gtk_spin_button_destroy (GtkObject *object)
 {
   gtk_spin_button_stop_spinning (GTK_SPIN_BUTTON (object));
-  
+
   GTK_OBJECT_CLASS (gtk_spin_button_parent_class)->destroy (object);
 }
 
@@ -1785,7 +1783,7 @@ gtk_spin_button_new_with_range (gdouble min,
                                gdouble max,
                                gdouble step)
 {
-  GtkObject *adj;
+  GObject *adj;
   GtkSpinButton *spin;
   gint digits;
 

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 4e72235bc880dd550984c751c93375d29f4850cc..01f6a2def382ea6d2850da3618d6d80ed82c4498 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -28,9 +28,6 @@
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
-
 
 G_BEGIN_DECLS
 
@@ -61,7 +58,7 @@ typedef void (* GtkTreeCellDataFunc) (GtkTreeViewColumn *tree_column,
 
 struct _GtkTreeViewColumn
 {
-  GtkObject parent;
+  GInitiallyUnowned parent_instance;
 
   GtkWidget *GSEAL (tree_view);
   GtkWidget *GSEAL (button);
@@ -112,7 +109,7 @@ struct _GtkTreeViewColumn
 
 struct _GtkTreeViewColumnClass
 {
-  GtkObjectClass parent_class;
+  GInitiallyUnownedClass parent_class;
 
   void (*clicked) (GtkTreeViewColumn *tree_column);
 

diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
index bcf2a8e6909fb060ee02e78f70fd89c027aa130d..d84358d89282bacfa244a5630688bb1eca9830d3 100644 (file)
--- a/gtk/gtkvolumebutton.c
+++ b/gtk/gtkvolumebutton.c
@@ -69,7 +69,7 @@ static void
 gtk_volume_button_init (GtkVolumeButton *button)
 {
   GtkScaleButton *sbutton = GTK_SCALE_BUTTON (button);
-  GtkObject *adj;
+  GObject *adj;
   GtkWidget *minus_button, *plus_button;
   const char *icons[] = {
        "audio-volume-muted",

diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index d4570f8b0fd74fffc6bce636424f7dadf437ff36..5cb2856b34010e1aa89f4b95a78c7655c089cfe8 100644 (file)
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -102,7 +102,7 @@ gtk_vscale_new_with_range (gdouble min,
                            gdouble max,
                            gdouble step)
 {
-  GtkObject *adj;
+  GObject *adj;
   GtkScale *scale;
   gint digits;
 

diff --git a/tests/flicker.c b/tests/flicker.c
index 39c9601c371a41d7061931f106d5f442cffa53f7..117e3e3f3dc9eac732c6d5465c6bff900b639212 100644 (file)
--- a/tests/flicker.c
+++ b/tests/flicker.c
@@ -7,51 +7,51 @@ create_flicker (void)
   GtkWidget *hpaned1;
   GtkWidget *vpaned2;
   GtkWidget *hbox2;
-  GtkObject *spinbutton7_adj;
+  GObject   *spinbutton7_adj;
   GtkWidget *spinbutton7;
-  GtkObject *spinbutton8_adj;
+  GObject   *spinbutton8_adj;
   GtkWidget *spinbutton8;
   GtkWidget *vbox1;
-  GtkObject *spinbutton9_adj;
+  GObject   *spinbutton9_adj;
   GtkWidget *spinbutton9;
-  GtkObject *spinbutton10_adj;
+  GObject   *spinbutton10_adj;
   GtkWidget *spinbutton10;
-  GtkObject *spinbutton11_adj;
+  GObject   *spinbutton11_adj;
   GtkWidget *spinbutton11;
-  GtkObject *spinbutton12_adj;
+  GObject   *spinbutton12_adj;
   GtkWidget *spinbutton12;
-  GtkObject *spinbutton13_adj;
+  GObject   *spinbutton13_adj;
   GtkWidget *spinbutton13;
-  GtkObject *spinbutton14_adj;
+  GObject   *spinbutton14_adj;
   GtkWidget *spinbutton14;
-  GtkObject *spinbutton15_adj;
+  GObject   *spinbutton15_adj;
   GtkWidget *spinbutton15;
-  GtkObject *spinbutton16_adj;
+  GObject   *spinbutton16_adj;
   GtkWidget *spinbutton16;
   GtkWidget *vpaned1;
   GtkWidget *hbox1;
-  GtkObject *spinbutton17_adj;
+  GObject   *spinbutton17_adj;
   GtkWidget *spinbutton17;
-  GtkObject *spinbutton18_adj;
+  GObject   *spinbutton18_adj;
   GtkWidget *spinbutton18;
-  GtkObject *spinbutton19_adj;
+  GObject   *spinbutton19_adj;
   GtkWidget *spinbutton19;
   GtkWidget *vbox2;
-  GtkObject *spinbutton20_adj;
+  GObject   *spinbutton20_adj;
   GtkWidget *spinbutton20;
-  GtkObject *spinbutton21_adj;
+  GObject   *spinbutton21_adj;
   GtkWidget *spinbutton21;
-  GtkObject *spinbutton22_adj;
+  GObject   *spinbutton22_adj;
   GtkWidget *spinbutton22;
-  GtkObject *spinbutton23_adj;
+  GObject   *spinbutton23_adj;
   GtkWidget *spinbutton23;
-  GtkObject *spinbutton24_adj;
+  GObject   *spinbutton24_adj;
   GtkWidget *spinbutton24;
-  GtkObject *spinbutton25_adj;
+  GObject   *spinbutton25_adj;
   GtkWidget *spinbutton25;
-  GtkObject *spinbutton26_adj;
+  GObject   *spinbutton26_adj;
   GtkWidget *spinbutton26;
-  GtkObject *spinbutton27_adj;
+  GObject   *spinbutton27_adj;
   GtkWidget *spinbutton27;
 
   window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 686cfa9467a738cc76668eacacf00a3dd2e0af83..a1aa61c4a4427036e15e8560f75c6e002e2c1480 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -5959,7 +5959,7 @@ create_range_controls (GtkWidget *widget)
   GtkWidget *scrollbar;
   GtkWidget *scale;
   GtkWidget *separator;
-  GtkObject *adjustment;
+  GObject *adjustment;
   GtkWidget *hbox;
 
   if (!window)

diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 9fbba7d23d072e839ce9f59b8bc49d41205e6bc4..0b0c5bff8895f8a89973d9b6f9ab786e1c874636 100644 (file)
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -327,8 +327,8 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type)
   GtkCellRenderer *rend;
   GdkPixbuf *pixbuf;
   GtkWidget *image;
-  GtkObject *adjustment;
-    
+  GObject *adjustment;
+
   current_column_type = type;
   
   col = gtk_tree_view_get_column (tree_view, 0);